From db9b8625ccaa654a9f0395ef500ee83f7b662320 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 19 Dec 2007 15:05:15 +0000 Subject: [PATCH] tools/examples/block better use of losetup -r Use losetup -r when the vbd is specified to be readonly, but only if -r is supported (rather than always creating a writeable losetup mapping if possible). This was inspired by (but not derived from) a diff from the Fedora 8 patchset which uses -r iff the vbd is specified as readonly. We need to be cleverer upstream because not all systems have losetup -r. Signed-off-by: Ian Jackson --- tools/examples/block | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/examples/block b/tools/examples/block index cd7bd78107..f946784f03 100644 --- a/tools/examples/block +++ b/tools/examples/block @@ -327,10 +327,13 @@ mount it read-write in a guest domain." fatal 'Failed to find an unused loop device' fi - status=$(losetup "$loopdev" "$file" || echo "failed") - if [ -n "$status" ]; then - do_or_die losetup -r "$loopdev" "$file" + if LANG=C losetup -h 2>&1 | grep read-only >/dev/null + then + roflag="-$mode"; roflag="${roflag#-w}" + else + roflag='' fi + do_or_die losetup $roflag "$loopdev" "$file" xenstore_write "$XENBUS_PATH/node" "$loopdev" write_dev "$loopdev" release_lock "block" -- 2.30.2